Replace gdk_rgb_find_color()

Use gdk_colormap_alloc_color() instead.

diff --git a/gdk/gdkgc.c b/gdk/gdkgc.c
index 65141c68a050d1fb915471553d6a2829a97de64a..d546a4902377cd891c79c8168c78158dc3e67473 100644 (file)
--- a/gdk/gdkgc.c
+++ b/gdk/gdkgc.c
@@ -31,7 +31,6 @@
 #include "gdkgc.h"
 #include "gdkinternals.h"
 #include "gdkpixmap.h"
-#include "gdkrgb.h"
 #include "gdkprivate.h"
 
 
@@ -1205,7 +1204,8 @@ gdk_gc_set_rgb_fg_color (GdkGC          *gc,
     return;
 
   tmp_color = *color;
-  gdk_rgb_find_color (cmap, &tmp_color);
+  if (!gdk_colormap_alloc_color (cmap, &tmp_color, FALSE, TRUE))
+    return;
   gdk_gc_set_foreground (gc, &tmp_color);
 }
 
@@ -1237,7 +1237,8 @@ gdk_gc_set_rgb_bg_color (GdkGC          *gc,
     return;
 
   tmp_color = *color;
-  gdk_rgb_find_color (cmap, &tmp_color);
+  if (!gdk_colormap_alloc_color (cmap, &tmp_color, FALSE, TRUE))
+    return;
   gdk_gc_set_background (gc, &tmp_color);
 }
 

diff --git a/tests/testwindows.c b/tests/testwindows.c
index 457072a8fa6ccffb0a4b91472ec1db8e75f3523d..93ca9768315c8ee079ac6e7f991330352d514370 100644 (file)
--- a/tests/testwindows.c
+++ b/tests/testwindows.c
@@ -51,7 +51,8 @@ create_window (GdkWindow *parent,
       bg->green = g_random_int_range (0, 0xffff);;
     }
   
-  gdk_rgb_find_color (gtk_widget_get_colormap (darea), bg);
+  if (!gdk_colormap_alloc_color (gtk_widget_get_colormap (darea), bg, FALSE, TRUE))
+    g_assert_not_reached ();
   gdk_window_set_background (window, bg);
   g_object_set_data_full (G_OBJECT (window), "color", bg, g_free);